Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 10 Sep 2010 05:24:05 +0000 (05:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 10 Sep 2010 05:24:05 +0000 (05:24 +0000)

Trivial merge